merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 21 Sep 2010 11:45:10 +0000 (20:45 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 21 Sep 2010 11:45:10 +0000 (20:45 +0900)

Trivial merge